Auto merge of #1275 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 4 Feb 2015 18:31:58 +0000 (18:31 +0000)
committerbors <bors@rust-lang.org>
Wed, 4 Feb 2015 18:31:58 +0000 (18:31 +0000)
Expanding on the work of #1256 to update to rustc 02-02


Trivial merge